Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 18 Nov 2005 15:32:04 +0000 (16:32 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 18 Nov 2005 15:32:04 +0000 (16:32 +0100)

Trivial merge